Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <[email protected]>
Thu, 4 Mar 2010 20:28:46 +0000 (21:28 +0100)
committerWolfgang Denk <[email protected]>
Thu, 4 Mar 2010 20:28:46 +0000 (21:28 +0100)

Trivial merge